Fix possible setting options list when camera uses exclusions #1548
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
julianoes
previously approved these changes
Sep 14, 2021
JonasVautherin
force-pushed
the
fix-camera-params-exclusion
branch
from
4848e58
to
a30687a
Compare
JonasVautherin
commented
Sep 16, 2021
Comment on lines
-489
to
-491
| if (_current_settings[parameter.first].needs_updating) { | ||
| continue; | ||
| } |
There was a problem hiding this comment.
I removed those lines because an exclusion does not depend on needs_updating. I could verify in the test camera_definition that the unit test below was wrong: it was exposing CAM_VIDFMT when it should actually have been excluded.
JonasVautherin
commented
Sep 16, 2021
| @@ -1633,14 +1633,15 @@ void CameraImpl::refresh_params() | |||
| // any other possible settings to change. However, we still would | |||
| // like to notify the current settings with this one change. | |||
| notify_current_settings(); | |||
| notify_possible_setting_options(); | |||
There was a problem hiding this comment.
This one line is the actual fix I needed 😅
julianoes
approved these changes
Sep 16, 2021
|
Working with the MAVSDK-Swift sample app! |
|
Fedora CI issue is unrelated. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently, parameters are refreshed when they are changed. If the camera definition defines an "update" dependency (not sure when that's done), then a parameter that is modified triggers a refresh in those update dependencies.
However, what is currently missing is a way to refresh parameters that were excluded. Let's have a look using the python
examples/camera_params.pyexample.Without this PR, say the camera is in VIDEO mode, with exposure set to "Aperture Priority". The output will be:
Note how there is no shutter option, because it is excluded by the aperture option. Now say you move to "Manual Exposure", the shutter option will not appear. This PR aims at fixing that, such that switching between "Manual", "Program Auto", "Shutter Priority" and "Aperture Priority" update the list accordingly.
This issue was first discovered in the MAVSDK-Swift sample app. I will test it there before setting this PR as "ready".